From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 28 Aug 2019 21:11:21 +0000 (-0700)
Subject: Remove $wgMemCachedDebug
X-Git-Tag: 1.34.0-rc.0~498^2
X-Git-Url: http://git.cyclocoop.org/data/%28%5B%5E/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=f78e39d3d70d5ac299e33c85cc1af73f8f739607;p=lhc%2Fweb%2Fwiklou.git

Remove $wgMemCachedDebug

Change-Id: I98380ac1cb66e33719b4836410311aea3513115c
---

diff --git a/RELEASE-NOTES-1.34 b/RELEASE-NOTES-1.34
index f7790cb628..e57dacc498 100644
--- a/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@ -81,6 +81,7 @@ For notes on 1.33.x and older releases, see HISTORY.
   password setups and deprecated since 1.24, is now removed.
 * $wgDBOracleDRCP - If you must use persistent connections, set DBO_PERSISTENT
   in the 'flags' field for servers in $wgDBServers (or $wgLBFactoryConf).
+* $wgMemCachedDebug - Set the cache "debug" field in $wgObjectCaches instead.
 
 === New user-facing features in 1.34 ===
 * Special:Mute has been added as a quick way for users to block unwanted emails
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 93a59190c4..9577a481d3 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2554,11 +2554,6 @@ $wgPHPSessionHandling = 'enable';
  */
 $wgSessionPbkdf2Iterations = 10001;
 
-/**
- * If enabled, will send MemCached debugging information to $wgDebugLogFile
- */
-$wgMemCachedDebug = false;
-
 /**
  * The list of MemCached servers and port numbers
  */
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index ad0f67e590..7db853d2e5 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -204,9 +204,6 @@ class ObjectCache {
 				if ( !isset( $params['servers'] ) ) {
 					$params['servers'] = $GLOBALS['wgMemCachedServers'];
 				}
-				if ( !isset( $params['debug'] ) ) {
-					$params['debug'] = $GLOBALS['wgMemCachedDebug'];
-				}
 				if ( !isset( $params['persistent'] ) ) {
 					$params['persistent'] = $GLOBALS['wgMemCachedPersistent'];
 				}